Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Multichain] fix: Disable submit button while replaying safe [SW-173] #4211

Merged
merged 2 commits into from
Sep 23, 2024

Conversation

usame-algan
Copy link
Member

What it solves

Resolves SW-173

How this PR fixes it

  • Adds a isSubmitDisabled state

How to test it

  1. Open a replayable safe
  2. Add another network
  3. Observe the submit button becoming disabled when clicked
  4. Observe the submit button becoming enabled when finished

Checklist

  • I've tested the branch on mobile 📱
  • I've documented how it affects the analytics (if at all) 📊
  • I've written a unit/e2e test for it (if applicable) 🧑‍💻

Copy link

Copy link

github-actions bot commented Sep 19, 2024

Copy link

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type Occurrences Fixable
Errors 0 0
Warnings 0 0
Ignored 0 N/A
  • Result: ✅ success
  • Annotations: 0 total

Report generated by eslint-plus-action

Copy link

github-actions bot commented Sep 19, 2024

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 979.49 KB (🟡 +25.24 KB)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Forty-two Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load
/ 507 B (🟢 -24.38 KB) 979.98 KB
/403 574 B (🟢 -3 B) 980.05 KB
/404 697 B (🟢 -1 B) 980.17 KB
/_error 230 B (🟡 +2 B) 979.71 KB
/_offline 1.09 KB (🟢 -3 B) 980.58 KB
/addOwner 535 B (🟡 +1 B) 980.01 KB
/address-book 26.11 KB (🟡 +16 B) 1005.6 KB
/apps 50.17 KB (🟢 -11 B) 1.01 MB
/apps/bookmarked 446 B (🟡 +1 B) 979.92 KB
/apps/custom 41.79 KB (🟢 -17 B) 1021.28 KB
/apps/open 54.74 KB (🟡 +2 B) 1.01 MB
/balances 30.66 KB (🟢 -340 B) 1010.14 KB
/balances/nfts 19.16 KB (🟢 -19 B) 998.65 KB
/cookie 8.76 KB (🟡 +27 B) 988.25 KB
/home 60.91 KB (🟡 +707 B) 1.02 MB
/imprint 1.38 KB (🟡 +2 B) 980.86 KB
/licenses 4.97 KB (🟢 -3 B) 984.45 KB
/new-safe/advanced-create 36.38 KB (🟡 +1.24 KB) 1015.87 KB
/new-safe/create 35.63 KB (🟡 +1.22 KB) 1015.12 KB
/new-safe/load 16.38 KB (🟢 -32 B) 995.87 KB
/privacy 15.9 KB (🟡 +24 B) 995.38 KB
/settings 450 B (🟢 -1 B) 979.93 KB
/settings/appearance 8.02 KB (🟢 -20 B) 987.51 KB
/settings/cookies 7.64 KB (🟢 -26 B) 987.12 KB
/settings/data 7.54 KB (🟢 -22 B) 987.03 KB
/settings/environment-variables 9.13 KB (🟢 -25 B) 988.61 KB
/settings/modules 9.76 KB (🟢 -21 B) 989.25 KB
/settings/notifications 27.85 KB (🟡 +835 B) 1007.33 KB
/settings/safe-apps 25.55 KB (🟢 -13 B) 1005.04 KB
/settings/security 8.06 KB (🟢 -25 B) 987.55 KB
/settings/setup 35.96 KB (🟢 -24 B) 1015.44 KB
/share/safe-app 9.72 KB (🟢 -3 B) 989.21 KB
/stake 589 B (🟢 -13 B) 980.06 KB
/swap 723 B (🟢 -9 B) 980.19 KB
/terms 11.24 KB (🔴 +10.71 KB) 990.73 KB
/transactions 73.47 KB (🟢 -57 B) 1.03 MB
/transactions/history 73.44 KB (🟢 -58 B) 1.03 MB
/transactions/messages 39.12 KB (🟢 -46 B) 1018.61 KB
/transactions/msg 29.5 KB (🟢 -18 B) 1008.99 KB
/transactions/queue 31.22 KB (🟢 -46 B) 1010.71 KB
/transactions/tx 21.05 KB (🟢 -18 B) 1000.54 KB
/welcome 6.77 KB (🟢 -4 B) 986.25 KB
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

Next to the size is how much the size has increased or decreased compared with the base branch of this PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this.

Copy link

github-actions bot commented Sep 19, 2024

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements
77.95% (-0.1% 🔻)
12332/15821
🔴 Branches
57.78% (-0.16% 🔻)
3168/5483
🟡 Functions
65.27% (-0.05% 🔻)
1945/2980
🟡 Lines
79.43% (-0.09% 🔻)
11132/14014
Show new covered files 🐣
St.
File Statements Branches Functions Lines
🟡
... / ChangeOwnerSetupWarning.tsx
50% 0% 0% 62.5%
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🔴
... / index.ts
50.48% (-14.66% 🔻)
13.89% (-29.59% 🔻)
35.71% (-7.14% 🔻)
51.65% (-14.67% 🔻)
🟢
... / index.tsx
96.3% (-0.76% 🔻)
88.46% (-2.01% 🔻)
100% 100%
🟢
... / multiChainSafe.ts
98.28% (-0.21% 🔻)
92% (-4% 🔻)
100%
98.11% (-1.89% 🔻)
🟡
... / index.tsx
62.6% (-0.28% 🔻)
47.37% 56.25%
63.11% (-0.3% 🔻)

Test suite run success

1524 tests passing in 206 suites.

Report generated by 🧪jest coverage report action from 3234a31

@katspaugh katspaugh changed the title fix: Disable submit button while replaying safe [SW-173] [Multichain] fix: Disable submit button while replaying safe [SW-173] Sep 19, 2024
@@ -69,27 +69,33 @@ const ReplaySafeDialog = ({
const customRpc = useAppSelector(selectRpc)
const dispatch = useAppDispatch()
const [creationError, setCreationError] = useState<Error>()
const [isSubmitDisabled, setIsSubmitDisabled] = useState<boolean>(false)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very similar to the submitDisabled variable.
Should we rename this to isSubmitting and inverse it?

Comment on lines 79 to 99

const selectedChain = chain ?? replayableChains?.find((config) => config.chainId === data.chainId)
if (!safeCreationData || !selectedChain) {
setIsSubmitDisabled(false)
return
}

// We need to create a readOnly provider of the deployed chain
const customRpcUrl = selectedChain ? customRpc?.[selectedChain.chainId] : undefined
const provider = createWeb3ReadOnly(selectedChain, customRpcUrl)
if (!provider) {
setIsSubmitDisabled(false)
return
}

// 1. Double check that the creation Data will lead to the correct address
const predictedAddress = await predictAddressBasedOnReplayData(safeCreationData, provider)
if (!sameAddress(safeAddress, predictedAddress)) {
setCreationError(new Error('The replayed Safe leads to an unexpected address'))
setIsSubmitDisabled(false)
return
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just use a try-catch-finally where we setIsSubmitDisabled(false) in the finally block?

Copy link

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type Occurrences Fixable
Errors 0 0
Warnings 0 0
Ignored 0 N/A
  • Result: ✅ success
  • Annotations: 0 total

Report generated by eslint-plus-action

Copy link

1 similar comment
Copy link

@usame-algan usame-algan merged commit 126a8bb into epic/multichain-safes Sep 23, 2024
14 checks passed
@usame-algan usame-algan deleted the disable-submit branch September 23, 2024 13:22
@github-actions github-actions bot locked and limited conversation to collaborators Sep 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants